From 6b0e4ba789a5bb9e66f23deac160ed6cbb15a976 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 27 Aug 2014 18:29:32 +0200 Subject: [PATCH] Adwaita: no edge hilight for popover checks/radios --- gtk/resources/theme/Adwaita/_common.scss | 1 + .../theme/Adwaita/gtk-contained-dark.css | 72 +++++++++++++++++++ gtk/resources/theme/Adwaita/gtk-contained.css | 72 +++++++++++++++++++ 3 files changed, 145 insertions(+) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 7a3b9721c9..6fd5867265 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1742,6 +1742,7 @@ $asset_suffix: if($variant=='dark', '-dark', ''); -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"), url("assets/#{$a}#{$as}#{$asset_suffix}@2.png")); icon-shadow: if(str-index($s,"backdrop"), none, 0 1px 0 $borders_edge); //no edge highlight for :backdrop + &.button.flat { icon-shadow: none; } } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 6f0ce5fe41..ebd55b0955 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1950,74 +1950,110 @@ GtkSwitch { .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check.button.flat { + icon-shadow: none; } .check:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:hover.button.flat { + icon-shadow: none; } .check:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:active.button.flat { + icon-shadow: none; } .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:insensitive.button.flat { + icon-shadow: none; } .check:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png")); icon-shadow: none; } + .check:backdrop.button.flat { + icon-shadow: none; } .check:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } + .check:backdrop:insensitive.button.flat { + icon-shadow: none; } .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:inconsistent.button.flat { + icon-shadow: none; } .check:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:inconsistent:hover.button.flat { + icon-shadow: none; } .check:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:inconsistent:selected.button.flat { + icon-shadow: none; } .check:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png")); icon-shadow: none; } + .check:inconsistent:backdrop.button.flat { + icon-shadow: none; } .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:inconsistent:insensitive.button.flat { + icon-shadow: none; } .check:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png")); icon-shadow: none; } + .check:inconsistent:insensitive:backdrop.button.flat { + icon-shadow: none; } .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:checked.button.flat { + icon-shadow: none; } .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:checked:insensitive.button.flat { + icon-shadow: none; } .check:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:checked:hover.button.flat { + icon-shadow: none; } .check:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .check:checked:active.button.flat { + icon-shadow: none; } .check:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png")); icon-shadow: none; } + .check:backdrop:checked.button.flat { + icon-shadow: none; } .check:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } + .check:backdrop:checked:insensitive.button.flat { + icon-shadow: none; } .menu .menuitem.check { -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); @@ -2030,74 +2066,110 @@ GtkSwitch { .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio.button.flat { + icon-shadow: none; } .radio:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:hover.button.flat { + icon-shadow: none; } .radio:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:active.button.flat { + icon-shadow: none; } .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:insensitive.button.flat { + icon-shadow: none; } .radio:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png")); icon-shadow: none; } + .radio:backdrop.button.flat { + icon-shadow: none; } .radio:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } + .radio:backdrop:insensitive.button.flat { + icon-shadow: none; } .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:inconsistent.button.flat { + icon-shadow: none; } .radio:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:inconsistent:hover.button.flat { + icon-shadow: none; } .radio:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:inconsistent:selected.button.flat { + icon-shadow: none; } .radio:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png")); icon-shadow: none; } + .radio:inconsistent:backdrop.button.flat { + icon-shadow: none; } .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:inconsistent:insensitive.button.flat { + icon-shadow: none; } .radio:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png")); icon-shadow: none; } + .radio:inconsistent:insensitive:backdrop.button.flat { + icon-shadow: none; } .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:checked.button.flat { + icon-shadow: none; } .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:checked:insensitive.button.flat { + icon-shadow: none; } .radio:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:checked:hover.button.flat { + icon-shadow: none; } .radio:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } + .radio:checked:active.button.flat { + icon-shadow: none; } .radio:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png")); icon-shadow: none; } + .radio:backdrop:checked.button.flat { + icon-shadow: none; } .radio:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } + .radio:backdrop:checked:insensitive.button.flat { + icon-shadow: none; } .menu .menuitem.radio { -gtk-icon-source: -gtk-icontheme("radio-symbolic"); diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 5abf7337c3..23f39fbfed 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1945,74 +1945,110 @@ GtkSwitch { .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); icon-shadow: 0 1px 0 white; } + .check.button.flat { + icon-shadow: none; } .check:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png")); icon-shadow: 0 1px 0 white; } + .check:hover.button.flat { + icon-shadow: none; } .check:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png")); icon-shadow: 0 1px 0 white; } + .check:active.button.flat { + icon-shadow: none; } .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } + .check:insensitive.button.flat { + icon-shadow: none; } .check:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png")); icon-shadow: none; } + .check:backdrop.button.flat { + icon-shadow: none; } .check:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png")); icon-shadow: none; } + .check:backdrop:insensitive.button.flat { + icon-shadow: none; } .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); icon-shadow: 0 1px 0 white; } + .check:inconsistent.button.flat { + icon-shadow: none; } .check:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png")); icon-shadow: 0 1px 0 white; } + .check:inconsistent:hover.button.flat { + icon-shadow: none; } .check:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png")); icon-shadow: 0 1px 0 white; } + .check:inconsistent:selected.button.flat { + icon-shadow: none; } .check:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png")); icon-shadow: none; } + .check:inconsistent:backdrop.button.flat { + icon-shadow: none; } .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); icon-shadow: 0 1px 0 white; } + .check:inconsistent:insensitive.button.flat { + icon-shadow: none; } .check:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png")); icon-shadow: none; } + .check:inconsistent:insensitive:backdrop.button.flat { + icon-shadow: none; } .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); icon-shadow: 0 1px 0 white; } + .check:checked.button.flat { + icon-shadow: none; } .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } + .check:checked:insensitive.button.flat { + icon-shadow: none; } .check:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png")); icon-shadow: 0 1px 0 white; } + .check:checked:hover.button.flat { + icon-shadow: none; } .check:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png")); icon-shadow: 0 1px 0 white; } + .check:checked:active.button.flat { + icon-shadow: none; } .check:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png")); icon-shadow: none; } + .check:backdrop:checked.button.flat { + icon-shadow: none; } .check:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png")); icon-shadow: none; } + .check:backdrop:checked:insensitive.button.flat { + icon-shadow: none; } .menu .menuitem.check { -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); @@ -2025,74 +2061,110 @@ GtkSwitch { .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); icon-shadow: 0 1px 0 white; } + .radio.button.flat { + icon-shadow: none; } .radio:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png")); icon-shadow: 0 1px 0 white; } + .radio:hover.button.flat { + icon-shadow: none; } .radio:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png")); icon-shadow: 0 1px 0 white; } + .radio:active.button.flat { + icon-shadow: none; } .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } + .radio:insensitive.button.flat { + icon-shadow: none; } .radio:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png")); icon-shadow: none; } + .radio:backdrop.button.flat { + icon-shadow: none; } .radio:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png")); icon-shadow: none; } + .radio:backdrop:insensitive.button.flat { + icon-shadow: none; } .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); icon-shadow: 0 1px 0 white; } + .radio:inconsistent.button.flat { + icon-shadow: none; } .radio:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png")); icon-shadow: 0 1px 0 white; } + .radio:inconsistent:hover.button.flat { + icon-shadow: none; } .radio:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png")); icon-shadow: 0 1px 0 white; } + .radio:inconsistent:selected.button.flat { + icon-shadow: none; } .radio:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png")); icon-shadow: none; } + .radio:inconsistent:backdrop.button.flat { + icon-shadow: none; } .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); icon-shadow: 0 1px 0 white; } + .radio:inconsistent:insensitive.button.flat { + icon-shadow: none; } .radio:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png")); icon-shadow: none; } + .radio:inconsistent:insensitive:backdrop.button.flat { + icon-shadow: none; } .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); icon-shadow: 0 1px 0 white; } + .radio:checked.button.flat { + icon-shadow: none; } .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } + .radio:checked:insensitive.button.flat { + icon-shadow: none; } .radio:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png")); icon-shadow: 0 1px 0 white; } + .radio:checked:hover.button.flat { + icon-shadow: none; } .radio:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png")); icon-shadow: 0 1px 0 white; } + .radio:checked:active.button.flat { + icon-shadow: none; } .radio:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png")); icon-shadow: none; } + .radio:backdrop:checked.button.flat { + icon-shadow: none; } .radio:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png")); icon-shadow: none; } + .radio:backdrop:checked:insensitive.button.flat { + icon-shadow: none; } .menu .menuitem.radio { -gtk-icon-source: -gtk-icontheme("radio-symbolic"); -- 2.30.2